Support destruction of device by /dev/sda1 (for example) even when the

configuration just said sda1.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/python/xen/xend/server/blkif.py b/tools/python/xen/xend/server/blkif.py
index b3b1247e6c4879bff987ff9d94003740bc82bb4c..d1b2fbbd7f7d4b8de8825dfe8d1a74af36a8dc07 100644 (file)
--- a/tools/python/xen/xend/server/blkif.py
+++ b/tools/python/xen/xend/server/blkif.py
@@ -93,8 +93,10 @@ class BlkifController(DevController):
         try:
             DevController.destroyDevice(self, int(devid))
         except ValueError:
+            devid_end = devid.split('/')[-1]
             for i in self.deviceIDs():
-                if self.readBackend(i, 'dev') == devid:
+                d = self.readBackend(i, 'dev')
+                if d == devid or d == devid_end:
                     DevController.destroyDevice(self, i)
                     return
             raise VmError("Device %s not connected" % devid)